gtk/gtkaccellabel.c gtk/gtkcalendar.c gtk/gtkclist.c gtk/gtkentry.c

2008-08-12  Michael Natterer  <mitch@imendio.com>

	* gtk/gtkaccellabel.c
	* gtk/gtkcalendar.c
	* gtk/gtkclist.c
	* gtk/gtkentry.c
	* gtk/gtkeventbox.c
	* gtk/gtkfilechooserbutton.c
	* gtk/gtkfilechooserdefault.c
	* gtk/gtkhandlebox.c
	* gtk/gtkhsv.c
	* gtk/gtkiconview.c
	* gtk/gtkimage.c
	* gtk/gtklayout.c
	* gtk/gtklistitem.c
	* gtk/gtkmenuitem.c
	* gtk/gtkmessagedialog.c
	* gtk/gtknotebook.c
	* gtk/gtkpaned.c
	* gtk/gtkpathbar.c
	* gtk/gtkplug.c
	* gtk/gtkprintunixdialog.c
	* gtk/gtkrange.c
	* gtk/gtkrecentchooserdefault.c
	* gtk/gtkruler.c
	* gtk/gtksocket.c
	* gtk/gtktext.c
	* gtk/gtktextview.c
	* gtk/gtktoolbar.c
	* gtk/gtktreeitem.c
	* gtk/gtktreeview.c
	* gtk/gtkviewport.c
	* gtk/gtkwin32embedwidget.c: chain up unconditionally in
	realize(), unrealize(), map(), unmap(), style_set(),
	key_press_event() and size_request()

svn path=/trunk/; revision=21088

diff --git a/ChangeLog b/ChangeLog
index a2b303bdb8380e3d82e35ea94bd3372be72a2156..2a271e4cfce01aacc75a7ae4cdde194d9600d505 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+2008-08-12  Michael Natterer  <mitch@imendio.com>
+
+       * gtk/gtkaccellabel.c
+       * gtk/gtkcalendar.c
+       * gtk/gtkclist.c
+       * gtk/gtkentry.c
+       * gtk/gtkeventbox.c
+       * gtk/gtkfilechooserbutton.c
+       * gtk/gtkfilechooserdefault.c
+       * gtk/gtkhandlebox.c
+       * gtk/gtkhsv.c
+       * gtk/gtkiconview.c
+       * gtk/gtkimage.c
+       * gtk/gtklayout.c
+       * gtk/gtklistitem.c
+       * gtk/gtkmenuitem.c
+       * gtk/gtkmessagedialog.c
+       * gtk/gtknotebook.c
+       * gtk/gtkpaned.c
+       * gtk/gtkpathbar.c
+       * gtk/gtkplug.c
+       * gtk/gtkprintunixdialog.c
+       * gtk/gtkrange.c
+       * gtk/gtkrecentchooserdefault.c
+       * gtk/gtkruler.c
+       * gtk/gtksocket.c
+       * gtk/gtktext.c
+       * gtk/gtktextview.c
+       * gtk/gtktoolbar.c
+       * gtk/gtktreeitem.c
+       * gtk/gtktreeview.c
+       * gtk/gtkviewport.c
+       * gtk/gtkwin32embedwidget.c: chain up unconditionally in
+       realize(), unrealize(), map(), unmap(), style_set(),
+       key_press_event() and size_request()
+
 2008-08-12  Michael Natterer  <mitch@imendio.com>
 
        * gtk/gtkwidget.c: change names of default implementations of

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index cb57aaa9269d9e037f6e90aeef8eae92d4504cc6..7e211f0bad42108c1282ecf8510c0a44fb9e0a05 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/gtk/gtkaccellabel.c
@@ -266,9 +266,8 @@ gtk_accel_label_size_request (GtkWidget          *widget,
   GtkAccelLabel *accel_label = GTK_ACCEL_LABEL (widget);
   PangoLayout *layout;
   gint width;
-  
-  if (GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->size_request)
-    GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->size_request (widget, requisition);
+
+  GTK_WIDGET_CLASS (gtk_accel_label_parent_class)->size_request (widget, requisition);
 
   layout = gtk_widget_create_pango_layout (widget, gtk_accel_label_get_string (accel_label));
   pango_layout_get_pixel_size (layout, &width, NULL);

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index ff5003c6fbabc1a77b7c8a747b755c29ffacdb77..31b14c91d4ff021a70af38851e9b51da436e432c 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1657,8 +1657,7 @@ gtk_calendar_unrealize (GtkWidget *widget)
       priv->day_name_win = NULL;      
     }
 
-  if (GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_calendar_parent_class)->unrealize (widget);
 }
 
 static gchar*

diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 274b5359643b28a7523ca122a1833fd212819fc4..490e87a5e69adfbc37b700a26fc177c2719e8bcd 100644 (file)
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -4662,8 +4662,7 @@ gtk_clist_unrealize (GtkWidget *widget)
   clist->fg_gc = NULL;
   clist->bg_gc = NULL;
 
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
 }
 
 static void
@@ -4817,14 +4816,9 @@ static void
 gtk_clist_style_set (GtkWidget *widget,
                     GtkStyle  *previous_style)
 {
-  GtkCList *clist;
-
-  g_return_if_fail (GTK_IS_CLIST (widget));
-
-  if (GTK_WIDGET_CLASS (parent_class)->style_set)
-    GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
+  GtkCList *clist = GTK_CLIST (widget);
 
-  clist = GTK_CLIST (widget);
+  GTK_WIDGET_CLASS (parent_class)->style_set (widget, previous_style);
 
   if (GTK_WIDGET_REALIZED (widget))
     {

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index c65015460451d2730fcc4f532f93124c61dd4ff9..91a6662421fd2189c55c4af3b958458ad5876a2b 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -1384,8 +1384,7 @@ gtk_entry_unrealize (GtkWidget *widget)
       entry->popup_menu = NULL;
     }
 
-  if (GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_entry_parent_class)->unrealize (widget);
 }
 
 void

diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index b96b725ec73469e93591b2d8ccc6769c2b94ff6a..e29e0c2ad936c5ec787f9180397861e7e41451ff 100644 (file)
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -450,8 +450,7 @@ gtk_event_box_unrealize (GtkWidget *widget)
       priv->event_window = NULL;
     }
 
-  if (GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_event_box_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 0b2dd1518815bda079711db429609198c76c0cc3..61ac369cc714387c552f85824ac7b7cc38ad6abd 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -1159,8 +1159,7 @@ gtk_file_chooser_button_map (GtkWidget *widget)
       priv->folder_has_been_set = TRUE;
     }
 
-  if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map)
-    GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map (widget);
+  GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->map (widget);
 }
 
 static gboolean
@@ -1369,9 +1368,8 @@ static void
 gtk_file_chooser_button_style_set (GtkWidget *widget,
                                   GtkStyle  *old_style)
 {
-  if (GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set (widget,
-                                                                       old_style);
+  GTK_WIDGET_CLASS (gtk_file_chooser_button_parent_class)->style_set (widget,
+                                                                     old_style);
 
   if (gtk_widget_has_screen (widget))
     change_icon_theme (GTK_FILE_CHOOSER_BUTTON (widget));

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index f840abc12bc87d5e5f108fc75246c0d877dffa9d..593a6048a07330e8ad2e287e69047a89706b0d49 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -5835,8 +5835,7 @@ gtk_file_chooser_default_style_set (GtkWidget *widget,
   impl = GTK_FILE_CHOOSER_DEFAULT (widget);
 
   profile_msg ("    parent class style_set start", NULL);
-  if (GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->style_set)
-    GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->style_set (widget, previous_style);
+  GTK_WIDGET_CLASS (_gtk_file_chooser_default_parent_class)->style_set (widget, previous_style);
   profile_msg ("    parent class style_set end", NULL);
 
   if (gtk_widget_has_screen (GTK_WIDGET (impl)))

diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c
index 8f94d18c6b3fd50a42b0ffaff2df762201b7fad8..b4f894552254f531582af727f45136a7147c08d8 100644 (file)
--- a/gtk/gtkhandlebox.c
+++ b/gtk/gtkhandlebox.c
@@ -468,8 +468,7 @@ gtk_handle_box_unrealize (GtkWidget *widget)
   gdk_window_destroy (hb->float_window);
   hb->float_window = NULL;
 
-  if (GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_handle_box_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkhsv.c b/gtk/gtkhsv.c
index 03d8e82e8fa325fbe66f66c7b9c52558ca65dba8..1c05bd5f73e1181ea6340fc29e169f64fb5d24f6 100644 (file)
--- a/gtk/gtkhsv.c
+++ b/gtk/gtkhsv.c
@@ -330,9 +330,8 @@ gtk_hsv_unrealize (GtkWidget *widget)
   
   g_object_unref (priv->gc);
   priv->gc = NULL;
-  
-  if (GTK_WIDGET_CLASS (gtk_hsv_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_hsv_parent_class)->unrealize (widget);
+
+  GTK_WIDGET_CLASS (gtk_hsv_parent_class)->unrealize (widget);
 }
 
 /* Size_request handler for the HSV color selector */

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 8ad26d7b40babaefa0634becb5d3ac15b8ece480..682ec954a381f93aeb8c6cf75bdad0630ac7f953 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1231,9 +1231,7 @@ gtk_icon_view_unrealize (GtkWidget *widget)
   gdk_window_destroy (icon_view->priv->bin_window);
   icon_view->priv->bin_window = NULL;
 
-  /* GtkWidget::unrealize destroys children and widget->window */
-  if (GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_icon_view_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index 37a728ecec1beff63a2e35f063084d89b93a13fa..9f4b111362b6835f4f9bdec24c71e440d82646ed 100644 (file)
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -1458,8 +1458,7 @@ gtk_image_unmap (GtkWidget *widget)
 {
   gtk_image_reset_anim_iter (GTK_IMAGE (widget));
 
-  if (GTK_WIDGET_CLASS (gtk_image_parent_class)->unmap)
-    GTK_WIDGET_CLASS (gtk_image_parent_class)->unmap (widget);
+  GTK_WIDGET_CLASS (gtk_image_parent_class)->unmap (widget);
 }
 
 static void
@@ -1467,8 +1466,7 @@ gtk_image_unrealize (GtkWidget *widget)
 {
   gtk_image_reset_anim_iter (GTK_IMAGE (widget));
 
-  if (GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_image_parent_class)->unrealize (widget);
 }
 
 static gint
@@ -2228,9 +2226,8 @@ gtk_image_style_set (GtkWidget      *widget,
 
   image = GTK_IMAGE (widget);
 
-  if (GTK_WIDGET_CLASS (gtk_image_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_image_parent_class)->style_set (widget, prev_style);
-  
+  GTK_WIDGET_CLASS (gtk_image_parent_class)->style_set (widget, prev_style);
+
   icon_theme_changed (image);
 }
 

diff --git a/gtk/gtklayout.c b/gtk/gtklayout.c
index fac55ba0bc070d1e8315434d3907d453f3017145..ccd8ede6bf23f54585beaf776c6f16a51ce64fe8 100644 (file)
--- a/gtk/gtklayout.c
+++ b/gtk/gtklayout.c
@@ -881,10 +881,10 @@ gtk_layout_realize (GtkWidget *widget)
 }
 
 static void
-gtk_layout_style_set (GtkWidget *widget, GtkStyle *old_style)
+gtk_layout_style_set (GtkWidget *widget,
+                      GtkStyle  *old_style)
 {
-  if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
+  GTK_WIDGET_CLASS (gtk_layout_parent_class)->style_set (widget, old_style);
 
   if (GTK_WIDGET_REALIZED (widget))
     {
@@ -926,8 +926,7 @@ gtk_layout_unrealize (GtkWidget *widget)
   gdk_window_destroy (layout->bin_window);
   layout->bin_window = NULL;
 
-  if (GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_layout_parent_class)->unrealize (widget);
 }
 
 static void     

diff --git a/gtk/gtklistitem.c b/gtk/gtklistitem.c
index a0df6005c060339ea4ac4b24d56dc03079db37d5..f3aa6a1f7976849a57014662097f8c172fb71694 100644 (file)
--- a/gtk/gtklistitem.c
+++ b/gtk/gtklistitem.c
@@ -427,8 +427,7 @@ gtk_list_item_realize (GtkWidget *widget)
   GdkWindowAttr attributes;
   gint attributes_mask;
 
-  /*if (GTK_WIDGET_CLASS (parent_class)->realize)
-    GTK_WIDGET_CLASS (parent_class)->realize (widget);*/
+  /*GTK_WIDGET_CLASS (parent_class)->realize (widget);*/
 
   g_return_if_fail (GTK_IS_LIST_ITEM (widget));
 

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index b8ab1e8d740e650dd34cebf888840edecb66b74b..5a966059300df8bf9ecbeab364c5152bb8453939 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -853,8 +853,7 @@ gtk_menu_item_unrealize (GtkWidget *widget)
   gdk_window_destroy (menu_item->event_window);
   menu_item->event_window = NULL;
 
-  if (GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_menu_item_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index dc6c57f1e8a389da5ff9e3d2a16d12bd16f0a808..ca8356018bd20608bf68404b21bc3f109fa64044 100644 (file)
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -892,8 +892,7 @@ gtk_message_dialog_style_set (GtkWidget *widget,
 
   setup_primary_label_font (dialog);
 
-  if (GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set)
-    (GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set) (widget, prev_style);
+  GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_set (widget, prev_style);
 }
 
 #define __GTK_MESSAGE_DIALOG_C__

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 1eddcd015fd3fc696e2ecafa6c9fc7797ccc155c..75521c701d37eedc8ba7b48b842881032c4cee8d 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1784,8 +1784,7 @@ gtk_notebook_unrealize (GtkWidget *widget)
       priv->drag_window = NULL;
     }
 
-  if (GTK_WIDGET_CLASS (gtk_notebook_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_notebook_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_notebook_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 8778673364d5fc471028728369c49cf6b42f12b1..186499be813d4fb1f9c4d749392269f704052cd8 100644 (file)
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -773,8 +773,7 @@ gtk_paned_unrealize (GtkWidget *widget)
   gtk_paned_set_saved_focus (paned, NULL);
   gtk_paned_set_first_paned (paned, NULL);
 
-  if (GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_paned_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index be6996d34ffafdcd9e928b9e585d9f6c76e70855..a1a5093bd2fa46d57ab3da16632f2fccd81c991c 100644 (file)
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -648,8 +648,7 @@ static void
 gtk_path_bar_style_set (GtkWidget *widget,
                        GtkStyle  *previous_style)
 {
-  if (GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set (widget, previous_style);
+  GTK_WIDGET_CLASS (gtk_path_bar_parent_class)->style_set (widget, previous_style);
 
   gtk_path_bar_check_icon_theme (GTK_PATH_BAR (widget));
 }

diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 12a31adca45ef44929d2b356f6595dae0bbd1aed..a692de8be34a0536d6ffe1b88c2b9d567a173a70 100644 (file)
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -567,8 +567,7 @@ gtk_plug_unrealize (GtkWidget *widget)
       g_object_unref (plug->modality_group);
     }
 
-  if (GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_plug_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 783ea4454c3678983b29d2919dd92e5054f39075..48ed989bd089b45159511b3ecab9f2a71c27eb84 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1630,8 +1630,7 @@ static void
 gtk_print_unix_dialog_style_set (GtkWidget *widget,
                                 GtkStyle  *previous_style)
 {
-  if (GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set)
-    GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set (widget, previous_style);
+  GTK_WIDGET_CLASS (gtk_print_unix_dialog_parent_class)->style_set (widget, previous_style);
 
   if (gtk_widget_has_screen (widget))
     {

diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 78c28d66abd34e8387a9138122092217c935953c..3ae11a5a12c2fff6c57092d194517ae9262d4e38 100644 (file)
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -1294,8 +1294,7 @@ gtk_range_unrealize (GtkWidget *widget)
   gdk_window_destroy (range->event_window);
   range->event_window = NULL;
 
-  if (GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_range_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkrecentchooserdefault.c b/gtk/gtkrecentchooserdefault.c
index 57ee733759a3da543e50e748844703e6a8ecce48..6551fdbbc60d2596fcb63fa09b694fab488a431b 100644 (file)
--- a/gtk/gtkrecentchooserdefault.c
+++ b/gtk/gtkrecentchooserdefault.c
@@ -925,9 +925,8 @@ static void
 gtk_recent_chooser_default_map (GtkWidget *widget)
 {
   GtkRecentChooserDefault *impl = GTK_RECENT_CHOOSER_DEFAULT (widget);
-  
-  if (GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map)
-    GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
+
+  GTK_WIDGET_CLASS (_gtk_recent_chooser_default_parent_class)->map (widget);
 
   /* reloads everything */
   reload_recent_items (impl);

diff --git a/gtk/gtkruler.c b/gtk/gtkruler.c
index 89f6d05f570b6d5493239354b48d870138af6e4e..f2791d9d15302d857b47c4c06b181b3049a11662 100644 (file)
--- a/gtk/gtkruler.c
+++ b/gtk/gtkruler.c
@@ -407,8 +407,7 @@ gtk_ruler_unrealize (GtkWidget *widget)
       ruler->non_gr_exp_gc = NULL;
     }
 
-  if (GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 7fabd59a32d2f9d8c877da7947b40ea6f23ba5f3..892964879540df66e8c9a1780d0b8d8144ba4f0b 100644 (file)
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -407,8 +407,7 @@ gtk_socket_unrealize (GtkWidget *widget)
       _gtk_socket_end_embedding (socket);
     }
 
-  if (GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_socket_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 5bc1aa1ce5515b577d792ee9efde71edee018ae2..c98a4840471019436475b8927d1c8a22367a1fbd 100644 (file)
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -1374,8 +1374,7 @@ gtk_text_unrealize (GtkWidget *widget)
 
   free_cache (text);
 
-  if (GTK_WIDGET_CLASS (parent_class)->unrealize)
-    GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index c59ec95a43fbc97fec7664c0d5df7571d33298c3..734a0913a5c1ab1d832cd9729de87da009463041 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -4095,9 +4095,10 @@ gtk_text_view_key_press_event (GtkWidget *widget, GdkEventKey *event)
       retval = TRUE;
     }
   /* Binding set */
-  else if (GTK_WIDGET_CLASS (gtk_text_view_parent_class)->key_press_event &&
-          GTK_WIDGET_CLASS (gtk_text_view_parent_class)->key_press_event (widget, event))
-    retval = TRUE;
+  else if (GTK_WIDGET_CLASS (gtk_text_view_parent_class)->key_press_event (widget, event))
+    {
+      retval = TRUE;
+    }
   /* use overall editability not can_insert, more predictable for users */
   else if (text_view->editable &&
            (event->keyval == GDK_Return ||

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 12711ffdbf4b05eb21ce121313f402001ad0e2cc..b7c098c548c42060b3867e758c093fdf47566a71 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -861,9 +861,8 @@ gtk_toolbar_unrealize (GtkWidget *widget)
       gdk_window_destroy (priv->event_window);
       priv->event_window = NULL;
     }
-  
-  if (GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize (widget);
+
+  GTK_WIDGET_CLASS (gtk_toolbar_parent_class)->unrealize (widget);
 }
 
 static gint

diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index fbcd8fca0dd33397c3977138e55f4d8c9a24bf2f..22691fc3bb8860b7d29bd9ac0fa1e91e09fee552 100644 (file)
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -442,8 +442,7 @@ gtk_tree_item_remove_pixmaps (GtkTreeItem *tree_item)
 static void
 gtk_tree_item_realize (GtkWidget *widget)
 {
-  if (GTK_WIDGET_CLASS (parent_class)->realize)
-    GTK_WIDGET_CLASS (parent_class)->realize (widget);
+  GTK_WIDGET_CLASS (parent_class)->realize (widget);
 
   gdk_window_set_background (widget->window, 
                             &widget->style->base[GTK_STATE_NORMAL]);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index ec119b504eedba4a88288527fe704e7c0c313ad6..0ff6dda4c5ec155e5caf5671b61204a0fffd19ad 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1938,9 +1938,7 @@ gtk_tree_view_unrealize (GtkWidget *widget)
       priv->grid_line_gc = NULL;
     }
 
-  /* GtkWidget::unrealize destroys children and widget->window */
-  if (GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize (widget);
 }
 
 /* GtkWidget::size_request helper */

diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 72605499af434d6df2e6f7aa20464e948736e7e1..ad5a310441769cf2891def7e96a525c3adafae64 100644 (file)
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -637,8 +637,7 @@ gtk_viewport_unrealize (GtkWidget *widget)
   gdk_window_destroy (viewport->bin_window);
   viewport->bin_window = NULL;
 
-  if (GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_viewport_parent_class)->unrealize (widget);
 }
 
 static void

diff --git a/gtk/gtkwin32embedwidget.c b/gtk/gtkwin32embedwidget.c
index 621558fa2a0a3510dcb2f8300fb131e8a3ded3d8..6afd918a46fc1ecf8ef5c60fea883570e7e1aa7f 100644 (file)
--- a/gtk/gtkwin32embedwidget.c
+++ b/gtk/gtkwin32embedwidget.c
@@ -139,8 +139,7 @@ gtk_win32_embed_widget_unrealize (GtkWidget *widget)
       embed_widget->parent_window = NULL;
     }
 
-  if (GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize)
-    GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS (gtk_win32_embed_widget_parent_class)->unrealize (widget);
 }
 
 static LRESULT CALLBACK